From c9b293cb52002617273e2eef64a0b1129773b64c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 23 Aug 2020 21:00:45 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 481726 -> 482014 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index a738a54042a..8eb487cd956 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index 9e9e4094a9e192482590c90494c995ee6bfd3f21..cfd7e9aa166c64069a540eb69602609804f5a535 100644 GIT binary patch delta 223 zcmdnDS@zym*@hOz7N!>FEiC6ar*B-zC^FqZhDli8%Q4K+(=Ws|C?LocNGfC&E0h*z z=A|o?WTYxYr55EYg!#s5a&amEL1vo5bj43Bit6b_sRatUgrX3J%dgH*C72H*?7Jd+(Xq+7ENF05K~Nvu!`j#s1q50A6%R AQ2+n{ delta 53 zcmcb&Rd(NI*@hOz7N!>FEiC6ar$35kQ=a^QkA3=IE|%h{Pgx?`A9J$+F)I+WZGX(o H{@V`#RQeUS diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2